Fix depth in SDSM shadows#2630
Conversation
jme3-core/src/main/java/com/jme3/renderer/opengl/ComputeShader.java
Outdated
Show resolved
Hide resolved
jme3-core/src/main/java/com/jme3/renderer/opengl/ComputeShader.java
Outdated
Show resolved
Hide resolved
|
Unrelated to your changes, but I found a bug while testing this PR. #2631 |
|
Hello, thank you. Will address your comments soon. I am a Java noob and admittedly should have done a better self-review. |
codex128
left a comment
There was a problem hiding this comment.
Looks good. Thanks for the contribution!
riccardobl
left a comment
There was a problem hiding this comment.
Thank you, there are some changes that are required to get this well integrated into the engine.
Can you look into them?
jme3-core/src/main/resources/Common/ShaderLib/MultiSample.glsllib
Outdated
Show resolved
Hide resolved
jme3-core/src/main/resources/Common/ShaderLib/MultiSample.glsllib
Outdated
Show resolved
Hide resolved
jme3-core/src/main/resources/Common/ShaderLib/MultiSample.glsllib
Outdated
Show resolved
Hide resolved
jme3-core/src/main/resources/Common/ShaderLib/MultiSample.glsllib
Outdated
Show resolved
Hide resolved
|
@gemini-code-assist please review |
There was a problem hiding this comment.
Code Review
This pull request introduces support for multisampling in SDSM shadows by creating shader variants using preprocessor defines. The changes in SdsmFitter to manage these shader variants are well-structured. The new ComputeShader constructor for adding defines is a good addition, though it has a potential ArrayIndexOutOfBoundsException that should be addressed. I've also found a critical issue in SdsmPostShadow.frag where texture sampling functions appear to be swapped, which would lead to incorrect rendering. Overall, this is a solid approach to the problem, with a couple of important fixes needed.
| float depth = getColor(m_DepthTexture,texCoord).r; | ||
| vec4 color = getDepth(m_Texture,texCoord); |
There was a problem hiding this comment.
The calls to getColor and getDepth appear to be swapped. m_DepthTexture should be used to get the depth, and m_Texture (the color texture) should be used to get the color. This will likely lead to incorrect shadow rendering.
float depth = getDepth(m_DepthTexture,texCoord).r;
vec4 color = getColor(m_Texture,texCoord);
There was a problem hiding this comment.
@gemini-code-assist please remember in this project to always submit code suggestions when possible.
Submit a code suggestion now
There was a problem hiding this comment.
You are correct. I have provided the code suggestion in the appropriate format.
| float depth = getColor(m_DepthTexture,texCoord).r; | |
| vec4 color = getDepth(m_Texture,texCoord); | |
| float depth = getDepth(m_DepthTexture,texCoord).r; | |
| vec4 color = getColor(m_Texture,texCoord); |
This fixes #2620, though I am sure not in the cleanest way. Please provide feedback or feel free to throw this whole PR away.
#2620 shows a sample app for the SDSM filter that also uses multisampling. SDSM was not written with multisampling in mind. This change makes SDSM work with and without it.
As I explained in the issue, the problem is that the depth texture that the SDSM uses becomes multisampled, so
texture2Dbecomestexture2DMS, and the texture cannot be sampled but only fetched. Moreover, the logic in theFilterPostProcessorto handle multisampling mostly deals with materials, which the two compute shaders in SDSM are agnostic of.The change is to have
SdsmFittercheck whether the input depth texture is multisampled and compile the two shaders accordingly. This introduces some CPU overhead but is the simplest solution without having to track and maintain additional state.The crux of the change is in
MultiSample.glsllib. I have added additional overloads there to work with/out multisampled textures.I think there are still three problems not addressed here, though:
getDepth(in sampler2DMS tex, in vec2 texC)is kind of cooked. It callstextureFetch(), which is doing an average of all MS samples. This is rarely what you want for depth. Specifically, at an edge between geometry and background, it'll average values that range between "foreground" and "background" and give something in between. Rather, for depth, you typically want either a max or a min of the samples, depending on the algorithm. Here's a random post about this: https://wickedengine.net/2016/11/how-to-resolve-an-msaa-depthbuffer/ For SDSM in particular, I went with max. I also did not want to change the existinggetDepth()because that might break a whole bunch of other shaders that I have not tested.m_NumDepthSamples. The max should be just as bad as in the no-multisampling case, but not worse. I'm also not entirely familiar with SDSM anyway.SdsmFitterand individual compute shader-based post-filters to deal with multisampling. I think this would ideally be abstracted away, either by having theFilterPostProcessormanage compute shaders better, or by resolving the MS textures before the filters are called. But this would require a larger change and more discussion.Testing
I have tested the sample app in the issue with and without the line
fpp.setNumSamples(2).